Fix subquery formatting under conditional directives #405
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Copilot <[email protected]>
Collaborator
Author
|
Merge after #404 |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes subquery formatting under conditional directives by improving indentation calculation to properly consider parent-child relationships between conditional directives and subsequent blocks.
- Updates conditional directive handling to calculate proper indentation for blocks following directives
- Refactors keyword group block organization by moving option-related blocks to a dedicated package
- Adds comprehensive test coverage for various conditional directive scenarios
Reviewed Changes
Copilot reviewed 32 out of 32 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
| SqlElConditionLoopCommentBlock.kt | Core logic changes for conditional directive indentation calculation |
| SqlSubQueryGroupBlock.kt | Updates subquery indentation logic for conditional directive context |
| SqlBlockGenerator.kt | Adds support for new IN and WHERE group blocks |
| SqlInGroupBlock.kt | New block type for handling IN keyword formatting |
| SqlWhereGroupBlock.kt | New block type for WHERE clause formatting |
| Package refactoring files | Moves option keyword blocks to dedicated package structure |
| Test files | Comprehensive test data for conditional directive formatting scenarios |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
src/main/kotlin/org/domaframework/doma/intellij/formatter/handler/NotQueryGroupHandler.kt
Show resolved
Hide resolved
...tlin/org/domaframework/doma/intellij/formatter/block/group/subgroup/SqlSubQueryGroupBlock.kt
Show resolved
Hide resolved
...in/org/domaframework/doma/intellij/formatter/block/comment/SqlElConditionLoopCommentBlock.kt
Outdated
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
When writing a subquery under a conditional directive, the indentation was less than expected. This was due to not properly considering the parent-child relationship of conditional directives.
Solution
This fix ensures that when a block immediately follows a conditional directive and is not the directive itself, the indentation calculation also takes into account the text length of the parent block of the conditional directive. This results in correct indentation for subqueries under conditional directives.